This breaks at least on v1 type controllers with 2k pages. Lets revert it for now and rework it. This reverts commit d5578b8.
d5578b8