Didn't see this before I merged, can we replace defined('DRUPAL_ROOT') with drupal_is_cli() #5780