Convert #164241 to Flügger