This change is busting the build in Travis, it looks like.  Related?  Needed?