Convert #184657 to Flügger