pre-3.3.5 pull