Convert #189426 to Flügger