Convert #229614 to Flügger