Convert #624838 to Flügger