Revert 'snap to page' logic change as it has unintended side effects