Convert #228784 to Flügger