Revert D3908 due to issues on Mac platforms