Bug 908983 - Remove use of querySelector