This reverts commit d346d074ebe5347f730a70d3a88b12f279bb405d. I would like a chance to review this, please.