backward-compatible pivot-table

Change-Id: I8da287f1c89711bb110436219980aab746d5abd1