Rollback patches r14294 and r14296 from UDK2010.SR1 Branch.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14385 6f19259b-4bc3-4df7-8a09-765794883524