Revert parts of [1215] to reflects changes for #WP21767


git-svn-id: https://unit-tests.svn.wordpress.org/trunk@1230 4a5a2adb-35eb-4268-9a1b-fe04a4134342