First PR to get rid of this Async thing I don't like.

This basically gets rid of a thing I don't like.