Convert #228279 to Flügger