Convert #184641 to Flügger