Fix regression from eb42232311c70fa9864794487680b1030f4c06fd