Bug 944990 - Revert back to document.querySelector