Remerged botched merge from disable_async branch.  This should fix a number of issues.