Convert #189424 to Flügger