Fixing clean installation via drush.

#5022 
WIP