Revert r122936. I'll re-implement the change.