Convert #324337 to Flügger