Convert #264877 to Flügger