Convert #264391 to Flügger