[AArch64] Revert local changes included in Matthew's commit