This reverts commit 2fded193. Builtbot reports some test failures. Revert now so I can take time to fix the issues.