Bug 825545 followup - Fix building threadless shell. r=me