WP-2243 Cleaned up some silliness from the last feature commit.