Convert #549381 to Flügger