Revert "Improves constrained scroll logic so that there’s no unsettling animation."

This reverts commit 9ff11c2af7361e4a2ac5f1accc94c334b1803855.