am 7d5cf703: Merge "Revert "Fix an outstanding compaction bug in interpreter.""

* commit '7d5cf703f3c03769e5b2f7ebc9d216c52ee5c70d':
  Revert "Fix an outstanding compaction bug in interpreter."