Revert swap dimens
Merge pull request #551 from square/dimitris/revert

Revert swap dimens