Convert #354276 to Flügger