This reverts commit f3e8a6b.

See #646 for the reason.
As the old headers are already widely used, it is too late now.