WP-3491 Removing a few lines that were added incorrectly in the merge.