4b2ce108a8
This reverts commit dc70c57eaf807641cfdf4ec164942d635f7b517d. Reason for revert: Fixed failing test Change-Id: Ib434365f441d69853ea3af6da7f3c663c16e5e1e