Revert breaking change