Convert #188638 to Flügger