Reverted carrier hotfix v2

I've reverted the carrier hotfix for now. The problem was occurring occasionally, but with this fix it was happening a lot more. I will do more tests tomorrow. At least with this reversion of builds it will be a lot more stable again.