Remove monkey patch with server status check again.