Convert #189197 to Flügger