Revert create_constrained_square_crops()

Revert to old-style calling to minimise changes