Revert armor check commits.