Revert "Issue #2365469: Remove empty properties to avoid confusing drupal_render()."

This reverts commit 89e7fbae920e42b75cd68ac5455312732481ce20.
Issue #2365469: Fix test coverage for revert.