Convert #264306 to Flügger