Revering the async property until we properly fix the async issues.