Revert to old keypad

Change-Id: I685673a5a235b74e16d79ad57c6a330f0ad5bf77