fixup! Improve snapshot storage system for easy bisection #2694