Revert "FIX for #218: SRV creation is preventing use of _ character"

This reverts commit ec5269134604ebeb4c36ca53bfd429955056da1a.