Fix the old behavior to be the default