Issue #3350772 by Tasneem Natshah: Revert Fix using Drupal extension, allow using 5.x and switch to webship-js