Revert 0cce0f2..899ed49

This rolls back to commit 0cce0f2238e50a45f512c2b64855719054b2d38f.