Back out r41630 -- merging of Nuke extension to core