Reverted all the weirdness. Should be back to where we need to be.