Revert 699ccce..3b7bc83

This rolls back to commit 699ccce33b267672f6a45e9174aaa4bf1bf00926.