Convert #264427 to Flügger