Convert #228534 to Flügger