reversion from PPT-1830-git