Merge "Revert "And yet more logging for slow execution."" into lmp-dev