Revert "LWP Fix"

This reverts commit 0d6b8e0bcf4dea33dd7cc5e9814a1d23b1b00927.