Convert #264402 to Flügger