Revert fix for #2328111 as that is not in our Drupal repository yet