Convert #228273 to Flügger