Bug 901178 - Backout 7d4e75a5d414. r=nbp in person