Backed out 4.0 async support; not needed