Revert "Back button quick update"

This reverts commit 763d8b81d94d9e2b19623fefa00a8711f0dbff16.