Revert r190520 as it wasn't the right fix.