States restore methods properly (including super)

[Delivers #78995332]