Convert #548614 to Flügger