make the insane dev environment less insane (#4779)