Vital follow-up to fix of Trac #2045