Revert 8b652a7..0b7ed89

This rolls back to commit 8b652a7b8ff5fcac3b1770f38d621473e3f1fee6.