Bug 949051 - Reopening to see if Travis passes

Don't merge this, just opening it to see what Travis does.

This was previously merged and backed out due to test errors on Try that I can no longer reproduce. I kinda suspect the actual cause was some underlying funk in the tree.