more hardware unbreaking, temp patch

Change-Id: Ie43589a965d73d9a84593caedeec23504eeb3d2d