Revert "Improvements to AutoArmor"

This reverts commit 0e200cddc8014aae8f28736a5004749aab986b1e.