add back in changes which got clobbered in last commit.