Revert use of check serve setting