Convert #264281 to Flügger