Convert #614273 to Flügger