Brings it back to unify among all server-* .