Make the code somewhat smaller. Disable disk failure test for master for now.

Reviewed-by: schreiberal