Bug 852923, r=bz, a=lsblakk