This reverts commit 7b47ddc4691bf1df2dcb33b0a0ed23b78acd26d7.