Reverted changes, working with ZIP files for now.