Cheery picked from #3.