Fix BlockSnapshots not firing correctly due to patch mixup in 1.8 update. Closes #1591