This reverts commit 6b10bb4c292e27b87d072a658b1372a1ecc8fd36.