Revert "Moar Faction Fixes"

This reverts commit 3090b5bcb3f9d95a55244a01e24385da0b6275b5.