Convert #517485 to Flügger