Revert breaking changes