Merge pull request #1129 from lucboudreau/master

[BISERVER-10816] Revert of a previous commit.
[MONDRIAN-1844] Adds a public call to set the helper manually for testing.