Change the defaults to be backwards compatible (fix #13285)