Convert #264297 to Flügger