Revert "ERMAHGERD MOAR DASH SWAPPING BULLSHIT"

This reverts commit 35569d4f3cb51736d4ba72f723861767f096a6f0.