Convert #264287 to Flügger