Partial fix for Bug 895878

* oo-restorer beefed up to do a restore if gear is in any state of "idleness"