Convert #248317 to Flügger