Re-roll patch in attempt to make drush make happy.