Refs #18. Revert later, attempting to resolve travis error