Revert #84 due to error in Travis test