Reverse changes for dap, hard code for now