revert r179735, it has no testcases, and doesn't really make sense.