Bug 946233 - Revert to single quickshare behaviour (r=wesj, a=lsblakk)