Reverting the changes required to enable multiple service chaining from ...

Reverting the changes required to enable multiple service chaining from R1.06