revert (due to testbot failure) Issue #3042763 by Sergiu Stici, joseph.olstad: Drupal 9 Deprecated Code Report