Revert "Fixed class location problem"

This reverts commit 68aa77f717cb7b23b8871a13a8371c6e324c1240.