Reverting last couple of commits, can't reproduce the clang issues.

Did this fix itself?

Revert "Debugging travis test issues with clang."

This reverts commit cb8666da8ac23866061b60c41ba9c22b24fcb45d.