Convert #264429 to Flügger