Convert #417618 to Flügger