Convert #264247 to Flügger