Fix regression from cd8090d67ffbf761e08f63d49748d090e4eba578