Revert 2D GPU Core HW Acceleration commits; they have build errors