Convert #264338 to Flügger