Revert the extra SAMR and LSA checks.