Add patch to remove architectural debug config