View state hack is no longer needed
Merge pull request #35 from square/ray/less-stupid

View state hack is no longer needed