Reverted changes regarding new classes loading on runtime.