Fix regression from #1327 r=@jsantell