Revert "Bug 240 - NS Scaling Scale-out"

This reverts commit 1db958d9bb3ea59931b613b0d9be18da6ae523ad.

Change-Id: I7a3b8bf7e300641dcebffc41c639dc0e4e777383
4 files changed