Trying to restore FF2 to pre-2.0.0 merge from Powerlord