Revert 789b37f, fixing the real intent of my hacky code