I'm committing here instead of to render-pipeline because this seems like a change that it makes sense to give a workout in trunk.