Undo Changes related to LP-191.

Undo Changes related to LP-191.