Fix bug 271 on the release branch.