Convert #163585 to Flügger