Got rid of MatchHistory proxy workaround