Reverting since this caused Linux/odd_stack_size.cpp to fail on a bunch of builders. This reverts commit 34e2f4f2.