Fixed bad merge from the 4.2-dev branch for trq-1437.