I'll fix this in the other PR once this lands.