CC Modem On/Off Fix
(reverse-merged from commit baf117862899c72df7f23027a5e6ef6d16ad04ba)