Revert "more tweaks to Carrier lamp, almost there."

This reverts commit 118f5112fb9c1aab246d316412ce4183422b1213.