Revert 58a1847..b96ba83

This rolls back to commit 58a1847d25de28d90bae01173eaf8b28ddd0f498.