I'd vote we stay as-is. Most of these 2018.1 issues will work themselves out in short order, so, the channel would just become deprecated in a few weeks.