Revert "Cursor state changed"

This reverts commit f8881d790433b76db833546cfd3d641cb78e8ff2.
Revert d0880e2..41cc6ea

This rolls back to commit d0880e2d28fc64debad45ef8e0935fda89b7d855.