am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
  Switch back to old crop