Convert #324618 to Flügger