Convert #187627 to Flügger