Ready for Complete Re-start!

Change-Id: I3c77ef444991ca841309b16b19538366caf2e990