More like what Python 2 standard library does. Beware of relying on that though during an upgrade.

Fixes #1711