View state hack is no longer needed