Partially revert r65795 by undoing change to 'os'.
1 file changed