Revert 63831d7..0589e4c

This rolls back to commit 63831d7b578a706d3ac24c77e7412d9f93dcb9e1.