Convert #264636 to Flügger