Convert #624634 to Flügger