Convert #228948 to Flügger