Revert "use launcher2 for now"

This reverts commit eab9b0309473bbae4e9498809b6247eb48700f94.