Convert #264261 to Flügger