Added in the ABORT optimization logic from a newer wildmat release,