Removing cruft from 1.8.7 compliant commit.