Revert behavior to r251316.