Amazing that this worked without needing to fix tests, there be dragons in our custom fields.