Back out AND-160 fix attempts for now, looks like they did not work