This reverts commit dc70c57e. Reason for revert: Fixed failing test Change-Id: Ib434365f441d69853ea3af6da7f3c663c16e5e1e