abolishing this bit of hopefully unnecessary asynchronicity
scripted update of code from master at 4000e28 abolishing this bit of hopefully unnecessary asynchronicity