Restore back to 8/2/2014  before the dark times

Change-Id: I8fb0331cd348562ac14964f50137689c3c22287e