FORM 20-F/A year ended December 31, 2004