Comment out workaround for CMD check bug