This reverts commit 8a3b7d424d8edf53d0560db48247e6bca11176ee.
This change masked a non-backward compatible change made to the
Neutron core API. This is being cleaned up and thus this workaround
is no longer required.
Depends-on: Idf516ed9db24d779742cdff0584b48182a8502d6
Change-Id: I6695a6e17df1a395ada4ecf2b063b2c20870d99d