Revert last commit + busybox folder fix