Revert Massive Error Cascade

Rollback to commit a7b3f00726048b0262cc43a840f4298cb7400399.