Convert #189878 to Flügger