Convert #367677 to Flügger