Do rebase for render-all too (put back what @avahoffman had)

Do rebase for render-all too (put back what @avahoffman had) #278