Revert "Fix network-api direct database hits in metadata server"

This reverts commit 79ab96e34ba5b8dd3e4e542dd3a7f65624b13367.

This commit broke the Nova metadata API when using neutron.

Change-Id: I6855b03f00492fdf51e18c0dcb0a73590a71b374
Closes-bug: #1307582
Merge "Revert "Fix network-api direct database hits in metadata server""