Pulling busy-box fix from `master`