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

@thatch45 this makes the change backwards compatible.