Raides an issue about flipping default of this. Requires some other changes I think, so will do it on its own.