Simplify the reverted code. This reverts commit e9bbe8b87b.
e9bbe8b87b
Miscellaneous source files for the main Python shared library