Convert #387633 to Flügger