Convert #281391 to Flügger