Revert 6621d17..f0f93f8

This rolls back to commit 6621d17818a5e27ef848efb7e8af3e9befe26374.