Rollback fix from yesterday