Convert #264426 to Flügger