Revert "Baseline established - seeing how much I can get away with, now."

This reverts commit a335124830a97a761a0c71fe3d5de327e012b03f.