add back a switch that disappeared during main merge