Apply [ 3410649 ] to restore backwards compatibility.