Tweak to match new defaults in 0.6.5.