RVT: revert 4912 change of 4030 nose import bug
Merge pull request #5170 from cpcloud/remove-debug-and-move-nose

RVT: revert 4912 change of 4030 nose import bug