Revert "-M5.18.0 move to switches"

This reverts commit ee8625c79eb3ffcf231282dc9e958de1e943d882.