Revert 85f0670..7acd688

This rolls back to commit 85f06709002a6bf9d8d19ff1bdff51456b791037.