Revert "Make compute_capabilities_filter use ..."

This reverts commit a4ad62ac9fdacecfbc5229e688a7d937d177889b.

Nova baremetal architecture scheduling was broken by it. While
workarounds exist it is backwards incompatible, and baremetal is
supported since Grizzly.

Fix bug: 1213967

Change-Id: I319b8a17f3ae7a3b527d388c6ff2954c0bcc0108
Merge "Revert "Make compute_capabilities_filter use ...""