Convert #469739 to Flügger