Changes due to https://drupal.org/node/2218341 and https://drupal.org/node/2200867