Convert #189623 to Flügger