diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
index c062abd42d4..3e9e16a8a6f 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
@@ -259,20 +259,8 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer {
                     + NetUtils.getCidrSize(sourceNatIp.getVlanNetmask());
             String internalCidr = network.getGateway() + "/"
                     + network.getCidr().split("/")[1];
-            // assuming a vlan:
-            String vtag = sourceNatIp.getVlanTag();
-            BroadcastDomainType tiep = null;
-            try {
-                tiep = BroadcastDomainType.getTypeOf(vtag);
-            } catch (URISyntaxException use) {
-                throw new CloudRuntimeException("vlantag for sourceNatIp is not valid: " + vtag, use);
-            }
-            if (tiep == BroadcastDomainType.Vlan) {
-                vtag = BroadcastDomainType.Vlan.getValueFrom(BroadcastDomainType.fromString(vtag));
-            } else if (!(tiep == BroadcastDomainType.UnDecided || tiep == BroadcastDomainType.Native)) {
-                throw new CloudRuntimeException("only vlans are supported for sourceNatIp, at this moment: " + vtag);
-            }
-            long vlanid = (Vlan.UNTAGGED.equals(vtag)) ? 0 : Long.parseLong(vtag);
+            long vlanid = (Vlan.UNTAGGED.equals(sourceNatIp.getVlanTag())) ? 0
+                    : Long.parseLong(sourceNatIp.getVlanTag());
 
             CreateLogicalRouterCommand cmd = new CreateLogicalRouterCommand(
                     niciraNvpHost.getDetail("l3gatewayserviceuuid"), vlanid,