This reverts commit eda47fdd258ca666815122a931b82699a0629b87. It failed on NVidia, AMD and Windows bots. Investigating.