Revert "Remove fallback restrictions"

This reverts commit d3444ec1eb2424d3e6ad5889f180a79091e315ff.
Fallback during migration