Revert 068d6c9..729d9db

This rolls back to commit 068d6c9af438836f435fbaa84e8bed913e311844.