Merge "Revert "Revert "Implement RetransformClasses"""