Convert #264027 to Flügger