Revert "Armor. (Patch Pass: Second commit)"

This reverts commit 74e561025a6073ffc55b8b24d6c113c1d8fc14b3.