Revert "Remove thread-key for old pages"

This reverts commit cb288e3aad32e33033556ed7cf8e1b321a4dd3f3.