Merge pull request scratchfoundation#5295 from fsih/updateRender

Backing out the render change, because we want the recent render chan…

Author: fsih