Partial revert of 5643641f865bd200f9284e3372a2dd97258e8418 - revert opObjectExtraction changes only.