Convert #228548 to Flügger