Backed out changeset 7b156069de68 (bug 936065) for causing bug 950320 r=smacleod a=lsblakk