Revert 33476c6..1de1822

This rolls back to commit 33476c6c13bf80159fbde016f7d745ac042f5d92.