This was added to make removing ControlValue easier. We should get rid of these ugly methods eventually.