This reverts commit 5b0de575. Apparently that caused some test to get stuck on Linuxx. Reverting for now.