Revert "Introducing pp_sortkey."

Yep, I screwed this up.

This reverts commit f9e659cf0c03d2cb99527def8ca28585791d3e93.

Change-Id: I51095824730f90e7cc52ac47a9aebcbb01312419
Merge "Revert "Introducing pp_sortkey."" into REL1_23