This reverts commit 66b2a3733e7219e5291c633eb5778bec6500b74d. Possibly can happen after necessary code changes are in place. Change-Id: I04e092158dda2b5f5ca029378d1e7dc863de6001 Signed-off-by: David Brown <davidb@codeaurora.org> (cherry picked from commit 4235f0aeb789321b36eb01f29ffb329fc9d2169c)