Propagating bug fix having to do w/ homotopy to tpetra branch.