Convert #162285 to Flügger