Revert 18883 and 18912, as they break named pipes