Reverted ClasspathReader changes