Revert changes causing issues with showing state