Fix "fit to column" breakage.

I broke it during the grand cell storage refactoring.

Change-Id: I75361750a859b42d83f76dd4e30ad6b134af81c5
(cherry picked from commit 3c95f901d5f30919b339695ddac94bf5a67aa9a9)