* commit '54b3006b6340a2a311acb8f70d4602506e63b1ae': Undo some API changes that affect third party launcher writers