Revert r28544: the original code was fine.