Revert "LPS-48929 Keep the logic in the module"

cc/ @migue @mhan810