This reverts commit 68bcba6d7a1cc18996c0bcb7c62267c62d2040d0.
This reverts commit 410cbe3cf28913cca2fc61b3437306b841d08172 because some buildbots are not ready yet.