Revert 0de9a8d..5d76b64

This rolls back to commit 0de9a8d63ad375cc75474f4e3e8ea3a1cd6b6400.