Convert #228471 to Flügger