add back disabled production features