Revert 895d67b..8f93acb

This rolls back to commit 895d67b7d6d3ed3023d865541c39687d5c15fd1d.