Revert 70ad1f3..5eae62c

This rolls back to commit 70ad1f3277fed225c065ce88c23d144103a04b3b.