This reverts commit 7d1e1010. This commit was never meant to be committed (at least *not* on master).