Revert data container func.
Merge pull request #7 from drupalwxt/master

Revert data container func.