Convert #264276 to Flügger