Convert #405285 to Flügger