Revert b77ed58..3d4153b

This rolls back to commit b77ed589e0f9954dab05c5d551b1648148a03f6f.