reverting fixes introduced in Instrumenter.java explained in issue #1