Convert #387618 to Flügger