This reverts commit bd6a813a30be0f74ced3c9488976d717addcfa4b.