Revert Battle Factory Changes for this branch