Revert r217616. Problems and complexity it introduces negate its benefit