Issue #3227922 apply jascote patch to new fork

Closes #3227922 This mimics the patch generated by @jascote in https://www.drupal.org/project/wistia/issues/3227922#comment-14189097