Revert Dhruv's removal of references to config.