Removed the temp work around from subnet module