This reverts commit 378c4b221a6be75e1d32cb6fb3a773ce5de6dbda.