Attempt to fix classloading issues with last commit.