Gah! Git! Re-implement bounding box fix after merge fail.