Revert "add launcher override"

This reverts commit aae1eb20a664a200383e6dca8971e6ea426a49b7.

Change-Id: Iaffec1b34626b3a78c1529bece0816429b909458