Convert #264379 to Flügger