Convert #170238 to Flügger