3rd party modifications removed.