Remove rewrite per kujua-lite#514, fix supervisor disabled-service issue.