Undid todays carrier v1 hotfix.

Undid todays carrier v1 hotfix. Will upload new version with all fixes in a day or two.