Revert "Try to fix LGE menu button NPEs"

This reverts commit f3a3aaca6051b5ae464c026ff8d72e51a1d5a8a6.