Revert "Allow direct use of PropertyData when only one property is contributed."

This reverts commit 029879958291ba4c4bc10affba1e0aa4b331a759.
Value field template test added.