Reverting to Legacy version and tagging