Partial revert of the ResourcePointer system.  It was redundant and
didn't solve any problems