This reverts commit 133c55b4. Reason for revert: change was untested and not working Change-Id: I06d6e3c439ba541ae85dc148f91b184b9731b92d