Convert #264691 to Flügger