Merge "Revert "Always select the next higher density bucket when picking resources""