Bug 30717: (QA follow-up) Move to module