Convert #264590 to Flügger