Convert #228715 to Flügger