Revert 03cf909..d04a46f

This rolls back to commit 03cf9097e5e2f7ef743158c0dbee965adf804a43.