Convert #164075 to Flügger