Merge "Revert "Fix an outstanding compaction bug in interpreter.""