Convert #228426 to Flügger