Reverted some state tracking changes