Revert offending commit https://review.opencontrail.org/#/c/5477/ to restore sanity

Change-Id: I4eb6d10e7fb5dfe28dd81d9ccf12436a5f71d28f