commit: Backed out changeset a7da359711ce, restoring Ben's GPLv3 manual changes.