Convert #236485 to Flügger