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

[PRD-4229] - rolling back a performance optimization due to test failures, per Thomas.