Revert aba0838..4161793

This rolls back to commit aba0838cd145bf35642fe2e0d6c331ad6ae4d619.
Fixes back button bug