Convert #264449 to Flügger