Merge "Revert "Switch to new rendering pipeline""