Revert "New GPU driver from JB2.5 tree. This is currently a test."

This reverts commit cad8bd6320800772b9e3d74184903315da67e57e.