Revert "LPS-29988 Rollback as it has not been tested"

This reverts commit 6abf505e3e5b2f78623e9564f29bb182e49f3bc0.
LPS-29988 NPE