Patch for compatibility with swirl/fix_snapshots. Remains compatible with swirl/master.