Convert #354297 to Flügger