Convert #619271 to Flügger