Merge pull request #271 from clinuz/master

Revert changes causing issues with showing state

Reviewed-By: Ben Combee (ben.combee@lge.com)