Revert "Undo Changes related to LP-191."

This reverts commit caccf5107e2fa5d31208bb92bc6240fbf6b7d8b3.