Revert "Merge pull request #21 from CiscoSystems/de711"

This reverts commit cc5f138d02504e71d56fa0a33c88a8ab6e3a8546, reversing
changes made to 5bd9e48d9f8b53d4d3fffcf2c0d3bd1efc5468fa.

Automated tests fail with the changes introduced by this. This blocks subsequent builds

Not-in-upstream: True