WP-3375: Add back fields needed for WP-3405.