Removed api loading workaround.