Revert the last patch due to surprise travis breaks