Convert #264633 to Flügger