This reverts commit2d58482004and39ae144759. BUG=chromium:673183 Change-Id: I19abdb11fc3872d2499072de8269d0744ae2f90a Reviewed-on: https://boringssl-review.googlesource.com/13235 Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>