Convert #264853 to Flügger