Revert my mako patches, as it diverges from our branch (and is pointless on a htc kernel btw ..)