Rollback refactor and reliability improvements.