Reverting workaround for #58

It's not working under Pentaho 5.1 as reported in #161