Convert #228623 to Flügger