Trying to satisfy review requests (https://drupal.org/node/2138549).