Convert #264081 to Flügger