Revert 8f6b7fe..98c9176

This rolls back to commit 8f6b7fed33b4feb5d0ddd7c6483a4742d2d2f749.