Revert "[#3519377] Drupal 11 compatibility fixes."

Ted Cooperrequested to merge
revert-2dc36f90 into 8.x-1.x

This reverts merge request !3 (merged). It was merged onto the wrong branch.

Merge request reports