am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.

* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
  revert I057b7ac0 now that the layouts are the expected height.