Convert #158317 to Flügger