This reverts commit b78cd1ff021377d118095ab82c4dadba54a690e1.