Revert "Add overlays for multi-carrier"

This reverts commit 2c8f7cebfd28f43f6ce0d333842b13fafac44217.