Revert changes that were specific to docker 1.8, which is not supported by travis
Revert changes that were specific to docker 1.8, which is not supported by travis

Reviewers: emso

Reviewed By: emso

Differential Revision: https://phabricator-dot-shipshapecode.appspot.com/D138

google/shipshape,google/shipshape,google/shipshape,google/shipshape,google/shipshape,google/shipshape,google/shipshape