Convert #315633 to Flügger