Changed the way sprint numbers are handled.

This is currently broken until changes to persistent can be merged upstream.