Convert #164153 to Flügger