Convert #236299 to Flügger