Comment 2 for bug 1164058

Removing pullrequest just for the moment, and generalizing this bug a little.

Disregard the branch in comment #1, and check out this branch:

This contains a second fix aimed at ensuring correct holds-go-home behavior.

Testing is ongoing, so not asking for a merge quite yet (although anyone else is still welcome to test).