This reverts commit 9820783b60c24f9e1e1692c1f205de98765afdaf. There was Travis errors I'll need to look more at.