Revert to old data again while fixing a bug related to category listing.

This reverts commit 08d67f9aad085c01f26681228c2cce07802e93a3.