This reverts commit 7f839b8790f3e2a5079bc5bba72bad53c8ce04f0.