The simplification in e69f7ed5 introduced a glitch on the Back button, so let's take solve this by further simplifying the specific code for this button.