Convert #628486 to Flügger