WP-2200 Reversing one of the changes made in the last commit.