Convert #228839 to Flügger