R1:6bd2251fa22c

Possibly fix an issue with storage upgrade, see <https://github.com/facebook/phabricator/issues/399>