This reverts commit 1973a68f57c9052d834d3028390c0294ae62bc29.