Convert #264585 to Flügger