This reverts commit 5d65f8a7931c160fe5a11c120796779ba59789b9. Dependent commit ae3e228af7 was reverted in f31a36e7767e.