Reverting because 'Back' button is too big part II

This reverts commit 4433f6d0e640980d8fd76a30875bbe0fc8116dd6.