Convert #264231 to Flügger