Merge pull request #326 from golang/revert-275-go-context-stdlib

Revert "Update to standard library context package."