Pull in change from January to fix build failures.