WP-1874 Rolling back some earlier view changes.