Adjust switch from 3.1 master a little

We will just have to see if this works in wild.