Revert r262994 for now, it fails to boot on armv5.