Convert #228646 to Flügger