Convert #264441 to Flügger