Revert "use launcher2 for now"

This reverts commit e8fbd05044fb72d164628c3636a6bae6bf01dfe4.