Armor. (Make pass: Third commit)
Revert "Armor. (Make pass: Third commit)"

This reverts commit 6715019d56e69d8c7c34d7343b56dbc0ef49e333.