Merge "Revert "Simplify calling loopers"" into sc-dev