Try to work around drush weirdness