Revert r18735 and add the missing definition to svcctl.idl.