Convert #438261 to Flügger