Revert 85ab0ee..bd2bd0f

This rolls back to commit 85ab0ee8495dd302f000dd491e55311baa972c9d.