Convert #264424 to Flügger