Revert "New Strategy - still sucks"

This reverts commit c53cb6ba32afb3d31ffdcc67f225ea6ba80809ba.