This patch is causing intermittent errors in the automated tests, so reverting for now until this can be resolved. This reverts commit 1d9891989cf6d2c84bd49a8ed573f1f0f4fa15f5. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I237e31b1b8a1a1e28262851ae0a21cd7345f0f1b