8.0.x compatibility

Drupal 8.0.x HEAD compatibility.
Let's remove this as well.