Bug 1021664 - Revert patch for homebutton handling while Collection is o...

...pen [r=kgrandon]