Convert #228590 to Flügger