Restore recycler change from 158020