Revert r107556 based on the discussion.