Revert "Header columns for rtd and hpd displayed correctly."

This reverts commit bdcee8029ec9f188ec3183ba91e51f1290d6bb93.
Revert "Revert "Header columns for rtd and hpd displayed correctly.""

This reverts commit 8a343bdef351595b074b9ba98389d9a7a5317b28.