Revert "Fix back and home behavior"

This reverts commit 828df5020067aa477adbe1eefd88afa3fc5de900
8 files changed