Convert #315429 to Flügger