Revert r323087
This needs more thinking out and consensus, and the commit message was wrong AND there was a typo in the commit.
pointyhat: jpaetzel