Disable workaround