Convert #188627 to Flügger