Remove neutron workaround

The currently released neutron client has the code needed for
neutron, so this workaround is no longer needed.

Change-Id: Iaf40a3a6d455d713085ed9073f62e100d1b5cb22