Partial revert r71029, unrelated changes. Need caffeine before I commit