Custom Carrier 1/2
Revert "Future use"

This reverts commit d70ca61336b0df6fe7bf08ca386d36df2fdba604.