Convert #148317 to Flügger