Bug 965882 - Re-land 5a0f5ee71152e7f365bf078e345422bb2b1fef7c now that related infrastructure problems have been addressed, r=ahal