bug 834961: merge no longer needed in the private-browsing module