Is your feature request related to a problem? Please describe.
I'm always frustrated when we have migration code for an undefined number of releases.
Describe the solution you'd like
Revert 14abaa1
Describe alternatives you've considered
-
Additional context
#3572
