Release 153 bugid 99439

Revert changes that introduced p2-99439.