Revert breaking change that shouldn't have been in a patch