Convert #187679 to Flügger