Convert #517294 to Flügger