revert fix for scheduler bug

Revert fix for scheduler bug (I'm told it makes things worse)
https://review.openstack.org/#/c/107511/

Change-Id: Ic4af06111587a8a7f4a5cd919478e6a7597fa235