Bug 26581: (follow-up) Restore unsetting of doreturn