Using the ClassLoader is important too

Change-Id: I7cb1e6e350fd647ceb60ef1555dd7b9e277ed296