Addendum to #764548: restore 2.1 compatibility.
2 files changed