Revert a breaking change