Missed an import, or merged badly, or ...
Merge pull request #297 from axw/state-remove-state-txn-again

Missed an import, or merged badly, or ...