Convert #130438 to Flügger