Convert #264528 to Flügger