Go back to upstream release 14 August 2014 due to lock-ups in September
2014 release.