Removed all calls to url() per https://www.drupal.org/node/2346779