this should make CI pass... not sure if its what we want, though.
Merge pull request #614 from gidden/ci-fix

this should make CI pass... not sure if its what we want, though.