Recommit r224935 with a fix for the ObjC++/AArch64 bug that that revision