Partially revert the change on r298325 where there is an (-1) casted to a pointer.
Submitted by: pfg MFC after: 2 weeks.