This reverts commit f4afdece, reversing
changes made to e633a160.

This also fixes a bug where Kubemark was still using the core api scheme
to manipulate the Kubelet's types, which was the cause of the initial
revert.