[BEP-1006] Restore backwards compatibility.