Bug 959227 - Revert UITest changes introduced in bug 929388. r=zac