Convert #335261 to Flügger