Revert cf20499..d89cd9a

This rolls back to commit cf20499f4a5ace86312a4284c6dc80aed5566f6f.