Revert the AOSP on Mako

Fix things maybe?