Closes #2221305
This is done in a backwards-compatible way so that plugins that expect the old behavior will continue to work.