Hack the clickstart, do not take this commit