revert r12313. see also r7527, #1743, r7778, r12313, r12314, and #5352 -- in that order to make sense of this.