Revert "Custom carrier label" for now

This reverts commit f0f5fc5ed0e69fded41a0e7b2d21dd569a710943.