261d817a95
This reverts commit 0bc32dcce6.
Reason for revert: Tests are broken, perhaps caused by this one
Change-Id: Ie409f04931a27bd6da616c1e52e279eb07479631