Follow up commit posted. As @aadsm points out, this is technically “rolling” rather than unrolling, but it should have the desired effect.