[Saucy] restored patch, which was removed by ecident