Fixes patch that fails on initial field migration.