One year has passed since we introduced the grace
period and it is safe to remove it

Changelog: changed
EE: true