Revert one more time.
Comment out additional libraries.