Convert #436623 to Flügger