This also gets the tests green on my system: https://gist.github.com/mulder/3dc4c78f023f5935f711