Don't special case dev_server since it is also multhithreded now
Merge branch 'remove_devserver_special_treatement'