This reverts commit efaf3099. This reverts commit dc7bdc1e. Reverting patches due to buildbot failures.