Comment the workaround