Convert #264906 to Flügger