Changing this here would require to update the tests, which we'll avoid while migrating the lib.