Convert #285585 to Flügger