Patch to deprecate Control Panel #478