Reverted paginator changes for 2.1