Move from problematic callback style back to synchronized calling

[kevinxucs]

Move away from problematic async callback style, readopt traditional synchronized calling.