Convert #188631 to Flügger