This temporarily reverts commit 60bee9ff. The diff will be recommitted once the newly discovered regressions are fixed.