Convert #158564 to Flügger