Revert "Fix package.el cannot be loaded with Emacs 23 or before."

This reverts commit 2f4720b56a4a697c9e5d7d0068b1e7a132ec7d57.
Merge.