This reverts commit a6c5e97a. Reason for revert: Accidently introduces double-free bug in RedefineClasses. Change-Id: I021336c4fcf0cfb304915b0ffc5eaba5f91fdd5e