This feels like a rather specific change. If you try to explicitly include the field in a field spec, this will still break. See below for a suggested change.