TRUNK-2218: remove missed direct method calls
Merge pull request #544 from dkithmal/TRUNK-2218

TRUNK-2218: remove missed direct method calls