Revert "Merge pull request #93 from RallySoftware/DE21884"

This reverts commit d6f1ded3da450ca803184d4e8ba0c7ed5d92339e, reversing
changes made to f6e0e5ffa85ff6083a0a286d39271cc3eb59b8af.
Merge pull request #98 from RallySoftware/DE20709

Revert "Merge pull request #93 from RallySoftware/DE21884"