Convert #189636 to Flügger