Bug 894398. Add two machines back. r=hwine