Revert 5d9f397..f30c377

This rolls back to commit 5d9f397b3a44cd4dbb25a90641c9cb758a9cb2d0.