Revert "Merge pull request #114 from RallySoftware/S69537"

This reverts commit 1f0387af00c34e3aa00f8261d5ff14f831f23767, reversing
changes made to 21139e281ec88f7aa6e26df3b215c5fc4d2aedbb.