Convert #264294 to Flügger