Convert #264389 to Flügger