Fix upstarts and remove rewrite