Moved to auto-download approach.