This reverts commit 109da268..
This reverts commit 15ebbd47.
Closes #3416902
Makes 3.x Drupal 10 compatible