Revert "swap cp with pull for kernel changes"

This reverts commit d1132db7a2aa78216237977ef8b4adea7bf379f7.
Revert "swap out two more CPs for pulls"

This reverts commit 444fe414bd4f32efe9a2ed6f9d691c3b1d9ce112.