Bring back deprecated launcher, will be removed in 2.2