Bug 1091069 - Follow-up, adjust element wait