Revert "Issue #90"

This reverts commit a828d5c8ffea9dfd85964c8c18753aeb33d0bf8d.

Revert to 10/29 per request of Aidin.