Revert changes that broke backward binary compatibility.