This has been tested on machines that were failing with v1.8.1, and is reliable. Signed-off-by: Sean Cross <sean@xobs.io>