SLT-645 put back used code
Merge pull request #19 from SmartBear/SLT-645-undid-bad-changes

SLT-645 put back used code