This reverts commit da9c609b3c52b08f98353a1cb04ef2372eaddd53.