Revert "Merge pull request #128 from adobe/jhagenst/fix_113"

This reverts commit 0383c645f1101b91432a66f531e4e8020b845c22, reversing
changes made to 4c790baa1f51cbb4a1e62464d7508b6b5ab666f6.
Merge pull request #129 from adobe/iwehrman/revert-128

Revert "Merge pull request #128 from adobe/jhagenst/fix_113"