Revert "small cleanup no need to read state twice"

This reverts commit 22a1fd7650f9ae47e52a9e0fb5d3a10a567b5473.