Bug 964915 followup - Revert a small part of part 2 to fix Octane-raytrace regression. r=h4writer