Implement the changes in r515 of the Google Code project.