Revert commit 'reduce catalystlive running time'.

This did not work on Mac.

Change-Id: I1e43c9a3598762478dbfffd466f283e35cf381b1
Merge topic 'live-breakpoint' into next

c87f9d4d Revert commit 'reduce catalystlive running time'.