Convert #264237 to Flügger