[BISERVER-10816] Reverts the previous commit. Will fix this some other way.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform
Merge pull request #1129 from lucboudreau/master

[BISERVER-10816] Revert of a previous commit.