Fixes #5952, restores ignore access and hidden override states before re...

...cursively calling ->disable() on sub-entities