Convert #264339 to Flügger