Marking this deferred - we're not going to try to deal with this until we have
some other major reason to change the store layout.