ARIES-576 Fix the grace period support that I broke by accidentally leaving in my workaround so I didn't have to wait 5 minutes to see if my fix worked.