Convert #264846 to Flügger