Convert #264878 to Flügger