Revert "Changed from custom proxy type to Data.Proxy."

This reverts commit e3930f46e3be055c036ffb8d07211d95e7fb1793.