Convert #264376 to Flügger