Convert #264682 to Flügger