Revert 8666fbb..3816198

This rolls back to commit 8666fbb5707811cfa97c21faaca3242a542c7c3f.