Convert #228947 to Flügger