Convert #264226 to Flügger