Restore backwards-compatibility for #517