This reverts commit bbe8386499, reversing changes made to d958df0486. Change was poorly thought out, unnecessary, ill advised, and poorly implemented, but was accepted in the name of diplomacy. That was a mistake. Reverting.
bbe8386499
d958df0486