#2322267 Revert drupalorg_user field instances