Re #7402. Remove references to removed property name.
Merge remote-tracking branch 'origin/bugfix/7402_using_removed_property'