diff --git a/TEST b/TEST
index eba35a37dc..dd599d119a 100644
--- a/TEST
+++ b/TEST
@@ -71,8 +71,6 @@ case "$BB_NAME" in
 Amazon*)
     ;;
 CentOS*)
-    # Sporadic segmentation faults
-    TEST_ZTEST_SKIP="yes"
     # Sporadic VERIFY(!zilog_is_dirty(zilog)) failed
     TEST_ZILTEST_SKIP="yes"
     ;;
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 3271f82073..9da7916e5b 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -1164,6 +1164,8 @@ zio_write_bp_init(zio_t *zio)
 			zio->io_pipeline |= ZIO_STAGE_DDT_WRITE;
 			return (ZIO_PIPELINE_CONTINUE);
 		}
+		zio->io_bp_override = NULL;
+		BP_ZERO(bp);
 	}
 
 	if (!BP_IS_HOLE(bp) && bp->blk_birth == zio->io_txg) {