Revert "Fixes for the last state"

This reverts commit f0456d11c5241d322f8307fead950044d78f1994.