Revert "Carrier Label Squashed"

This reverts commit 1dee93921e29ac723311f80c964c3d4bc4fdf03f.