Convert #281845 to Flügger