#351 Don't include folders in rebase