Convert #354728 to Flügger