diff --git a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java b/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
index dff3dbe5c49..e1d49946b5e 100644
--- a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
+++ b/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
@@ -66,8 +66,9 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
 
     @Override
     public void execute(){
-    	PortForwardingRule rule = _rulesService.revokePortForwardingRule(id, true);
-        if (rule != null) {
+    	boolean result = _rulesService.revokePortForwardingRule(id, true);
+
+        if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
             this.setResponseObject(response);
         } else {
diff --git a/api/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java b/api/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java
index 951e458ebcc..c5401147119 100644
--- a/api/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java
+++ b/api/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java
@@ -81,8 +81,9 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
 	
     @Override
     public void execute() throws ResourceUnavailableException {
-        PortForwardingRule result = _rulesService.revokePortForwardingRule(id, true);
-        if (result != null) {
+        boolean result = _rulesService.revokePortForwardingRule(id, true);
+        
+        if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
             this.setResponseObject(response);
         } else {
diff --git a/api/src/com/cloud/network/rules/RulesService.java b/api/src/com/cloud/network/rules/RulesService.java
index f9d48bf618e..5914c67af44 100644
--- a/api/src/com/cloud/network/rules/RulesService.java
+++ b/api/src/com/cloud/network/rules/RulesService.java
@@ -44,7 +44,7 @@ public interface RulesService {
      * @param caller 
      * @return
      */
-    PortForwardingRule revokePortForwardingRule(long ruleId, boolean apply);
+    boolean revokePortForwardingRule(long ruleId, boolean apply);
     /**
      * List port forwarding rules assigned to an ip address
      * @param cmd the command object holding the criteria for listing port forwarding rules (the ipAddress)
diff --git a/server/src/com/cloud/network/rules/RulesManager.java b/server/src/com/cloud/network/rules/RulesManager.java
index 9d8550bcc20..1699d83828a 100644
--- a/server/src/com/cloud/network/rules/RulesManager.java
+++ b/server/src/com/cloud/network/rules/RulesManager.java
@@ -33,7 +33,6 @@ import com.cloud.utils.net.Ip;
  * Rules Manager manages the network rules created for different networks.
  */
 public interface RulesManager extends RulesService {
-    PortForwardingRule revokePortForwardingRule(String ruleId, Account caller);
     
     boolean applyPortForwardingRules(Ip ip, boolean continueOnError);
     
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index c983ac8ac1f..966d31a2a53 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -301,7 +301,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
     }
     
     @Override
-    public PortForwardingRule revokePortForwardingRule(long ruleId, boolean apply) {
+    public boolean revokePortForwardingRule(long ruleId, boolean apply) {
         UserContext ctx = UserContext.current();
         Account caller = ctx.getAccount();
         
@@ -314,15 +314,10 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
         revokeRule(rule, caller, ctx.getUserId());
         
         if (apply) {
-            applyPortForwardingRules(rule.getSourceIpAddress(), true);
+            return applyPortForwardingRules(rule.getSourceIpAddress(), true);
+        } else {
+            return true;
         }
-        return rule;
-    }
-
-    @Override
-    public PortForwardingRule revokePortForwardingRule(String ruleId, Account caller) {
-        // FIXME: Not working yet.
-        return null;
     }
     
     @Override
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 02dea7eefc2..f38d4272cc0 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -407,13 +407,13 @@ CREATE TABLE  `cloud`.`data_center` (
   `domain` varchar(100) COMMENT 'Network domain name of the Vms of the zone',
   `domain_id` bigint unsigned COMMENT 'domain id for the parent domain to this zone (null signifies public zone)',
   `networktype` varchar(255) NOT NULL DEFAULT 'Basic' COMMENT 'Network type of the zone',
-  `dns_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `gateway_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `firewall_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `dhcp_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `lb_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `vpn_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
-  `userdata_provider` char(64) NOT NULL DEFAULT 'VirtualRouter',
+  `dns_provider` char(64) DEFAULT 'VirtualRouter',
+  `gateway_provider` char(64) DEFAULT 'VirtualRouter',
+  `firewall_provider` char(64) DEFAULT 'VirtualRouter',
+  `dhcp_provider` char(64) DEFAULT 'VirtualRouter',
+  `lb_provider` char(64) DEFAULT 'VirtualRouter',
+  `vpn_provider` char(64) DEFAULT 'VirtualRouter',
+  `userdata_provider` char(64) DEFAULT 'VirtualRouter',
   `enable` tinyint NOT NULL DEFAULT 1 COMMENT 'Is this data center enabled for activities',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;