Revert r57685 (weird merge result).
1 file changed