LPS-47694 modified impl (much less work)

cc @hhuijser