Either way, I don't think this needs to be changed before merging.  As you said @mlevan, this is a temporary solution until the final version of persistence is designed.