3d85f72652
This reverts commit 72143e80daa86290455bdcf0da27132cdab4b84f. it seems that the previous build failure was a travis flake. reverting the revert...