Remove Drupal 2195775 workarounds