This reverts commit a69222d9.

Reason for revert: broke ppc64le

Change-Id: I57d275177e90f036caf7dbade9669b8121dfa437
Reviewed-on: https://go-review.googlesource.com/42194Reviewed-by: Michael Hudson-Doyle <michael.hudson@canonical.com>