Put back change related to 7.x-1.4 release.