ok, undo everything and make sure travis passes