Revert^2 "Fix correctness for fast path class loading"
am: 501c3b073e

Change-Id: Ief62c33450f3529006df31b83b35c6ad57dc6c08