8.0.x compatibility

Drupal 8.0.x HEAD compatibility.
We don't need this anymore?