Is this a new feature? If so, it should not be merged to the 1.7 branch and should wait for the next minor release: 1.8. Don't worry about backing it out now, but please remember this for future releases.