Resolve #3473083 "Avoid direct drupal calls"

J Prequested to merge
issue/soembed-3473083:3473083-avoid-direct-drupal-calls into 8.x-2.x

Closes #3473083

Merge request reports