Reverting the 3d collision detection stuff.  I am not smart enough to get this working in a timely manner. :(