This reverts commit 86c95d96.

We are not quite ready to do this. Our PR infrastructure gave
green light while it shouldn't have.