Convert #264387 to Flügger