Revert "attempt to fix constantly lit buttons"

Change-Id: Idc6ebdcbd1567a1b4c2897669fce998db8684560