[BACKLOG-350] - reverting previous commit c158aaf638f.  it causes test failures in bdp that need to be resolved.
Merge pull request #140 from kurtwalker/BACKLOG-350

[BACKLOG-350] - reverting previous commit c158aaf638f.  it causes test f...