Use string methods to replace the regular expression.
Merge pull request #941 from ClusterHQ/remove-re-939

Use string methods to replace the regular expression.