am 66b68faa: Merge "Revert "Revert "Fix an outstanding compaction bug in interpreter."""

* commit '66b68faa42cd36eb368f96c206b29c940ddda129':
  Revert "Revert "Fix an outstanding compaction bug in interpreter.""