e73b0ec69d
This reverts commit b480fe45ce.
Reason for revert: Conflicts with gestural navigation
Change-Id: I109fb855829b68d265458f9b3833482df2b59095