Revert "REVIEW-5028 simpler TaskSelector implementation relying on adaptation."

This reverts commit 21d27e80e477471ad71d015962f891aa68e72469.