Revert "kind of fixed the back button issue"

This reverts commit d44be01465cdca0487d9ecfbe149ba6c137fac7a.