This reverts commit d0e56778. Reason for revert: I think that test was already broken Change-Id: Iede5b711aa9dff333148f0a99d82c2ec9b1e10bc