WP-1892 Adding back some changes lost in last commit.