Convert #187039 to Flügger