Adding new restore functions to avoid saving boundary.