Convert #264881 to Flügger