[PRD-4229] - rolling back a performance optimization due to test failures.
Merge pull request #44 from mkambol/2TestFailure

[PRD-4229] - rolling back a performance optimization due to test failure...