Bug 1015425: Switching the registered field to pull from the proper
data value.
Merge pull request #3148 from ehelms/bug-1015425

Bug 1015425: Switching the registered field to pull from the proper