Revert "Changes to accomodate vpp throttle branch."

No match.