Bug 1044742 - Backout 8f13101a6dbb on a CLOSED TREE - r=bustage