Removing AF monkey patch (DCMKEY-327)