Convert #264269 to Flügger