Merge changes I06651995,I2f341cf7

* changes:
  Revert^2 "Move Trace to use trampolines"
  Fix typo in condition for getting the compiled code.