diff -r 5c943f0d8cbf src/mat/impls/aij/mpi/mpiaij.c
--- a/src/mat/impls/aij/mpi/mpiaij.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/mat/impls/aij/mpi/mpiaij.c	Tue Apr 10 12:32:31 2012 +0300
@@ -3628,8 +3628,6 @@
   PetscFunctionBegin;
   if (Ii[0]) SETERRQ1(PETSC_COMM_SELF,PETSC_ERR_ARG_OUTOFRANGE,"Ii[0] must be 0 it is %D",Ii[0]);
 
-  ierr = PetscLayoutSetBlockSize(B->rmap,1);CHKERRQ(ierr);
-  ierr = PetscLayoutSetBlockSize(B->cmap,1);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->rmap);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->cmap);CHKERRQ(ierr);
   m      = B->rmap->n;
diff -r 5c943f0d8cbf src/mat/impls/aij/mpi/mpicusp/mpiaijcusp.cu
--- a/src/mat/impls/aij/mpi/mpicusp/mpiaijcusp.cu	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/mat/impls/aij/mpi/mpicusp/mpiaijcusp.cu	Tue Apr 10 12:32:31 2012 +0300
@@ -15,8 +15,6 @@
   if (d_nz < 0) SETERRQ1(PETSC_COMM_SELF,PETSC_ERR_ARG_OUTOFRANGE,"d_nz cannot be less than 0: value %D",d_nz);
   if (o_nz < 0) SETERRQ1(PETSC_COMM_SELF,PETSC_ERR_ARG_OUTOFRANGE,"o_nz cannot be less than 0: value %D",o_nz);
 
-  ierr = PetscLayoutSetBlockSize(B->rmap,1);CHKERRQ(ierr);
-  ierr = PetscLayoutSetBlockSize(B->cmap,1);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->rmap);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->cmap);CHKERRQ(ierr);
   if (d_nnz) {
diff -r 5c943f0d8cbf src/mat/impls/dense/mpi/mpidense.c
--- a/src/mat/impls/dense/mpi/mpidense.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/mat/impls/dense/mpi/mpidense.c	Tue Apr 10 12:32:31 2012 +0300
@@ -1676,8 +1676,6 @@
    allocates the local dense storage space.  We should add error checking. */
 
   a    = (Mat_MPIDense*)mat->data;
-  ierr = PetscLayoutSetBlockSize(mat->rmap,1);CHKERRQ(ierr);
-  ierr = PetscLayoutSetBlockSize(mat->cmap,1);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(mat->rmap);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(mat->cmap);CHKERRQ(ierr);
   a->nvec = mat->cmap->n;
diff -r 5c943f0d8cbf src/mat/impls/dense/seq/dense.c
--- a/src/mat/impls/dense/seq/dense.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/mat/impls/dense/seq/dense.c	Tue Apr 10 12:32:31 2012 +0300
@@ -2105,8 +2105,6 @@
   PetscFunctionBegin;
   B->preallocated = PETSC_TRUE;
 
-  ierr = PetscLayoutSetBlockSize(B->rmap,1);CHKERRQ(ierr);
-  ierr = PetscLayoutSetBlockSize(B->cmap,1);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->rmap);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(B->cmap);CHKERRQ(ierr);
 
diff -r 5c943f0d8cbf src/mat/impls/shell/shell.c
--- a/src/mat/impls/shell/shell.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/mat/impls/shell/shell.c	Tue Apr 10 12:32:31 2012 +0300
@@ -494,8 +494,6 @@
   ierr = PetscNewLog(A,Mat_Shell,&b);CHKERRQ(ierr);
   A->data = (void*)b;
 
-  ierr = PetscLayoutSetBlockSize(A->rmap,1);CHKERRQ(ierr);
-  ierr = PetscLayoutSetBlockSize(A->cmap,1);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(A->rmap);CHKERRQ(ierr);
   ierr = PetscLayoutSetUp(A->cmap);CHKERRQ(ierr);
 
diff -r 5c943f0d8cbf src/vec/vec/impls/mpi/pmap.c
--- a/src/vec/vec/impls/mpi/pmap.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/vec/vec/impls/mpi/pmap.c	Tue Apr 10 12:32:31 2012 +0300
@@ -131,7 +131,7 @@
   PetscErrorCode ierr;
 
   PetscFunctionBegin;
-  if (map->bs <=0) map->bs = 1;
+  if (map->bs <= 0) map->bs = 1;
   if ((map->n >= 0) && (map->N >= 0) && (map->range)) PetscFunctionReturn(0);
 
   ierr = MPI_Comm_size(map->comm, &size);CHKERRQ(ierr);
diff -r 5c943f0d8cbf src/vec/vec/impls/seq/bvec2.c
--- a/src/vec/vec/impls/seq/bvec2.c	Mon Apr 09 22:04:11 2012 -0500
+++ b/src/vec/vec/impls/seq/bvec2.c	Tue Apr 10 12:32:31 2012 +0300
@@ -891,9 +891,6 @@
   s->array           = (PetscScalar *)array;
   s->array_allocated = 0;
 
-  if (v->map->bs == -1) {
-    ierr = PetscLayoutSetBlockSize(v->map,1);CHKERRQ(ierr);
-  }
   ierr = PetscLayoutSetUp(v->map);CHKERRQ(ierr);
   ierr = PetscObjectChangeTypeName((PetscObject)v,VECSEQ);CHKERRQ(ierr);
 #if defined(PETSC_HAVE_MATLAB_ENGINE)