Removed changes that are specific to my installation.