Revert "Merge pull request #30 from shalecraig/reset_affinities"

This reverts commit 61a6db40bb434eaa890a4c5f4594aab626624d70, reversing
changes made to 5c609def7af47075d73de997f98cca451d39e549.

Should've pushed into 1.1.0 instead of master :s