Convert #614485 to Flügger