This reverts commit 867e379c. For some reason this is upsetting Linux/Windows bots. Reverting while I try to reproduce.