This reverts commit 1b08f129. The
change was Jenkins-verified, but just rebasing it on top of latest
master (without getting conflicts) broke the test added in the commit.

So let's revert it for now to have time to find out why does the test
fail on top of latest master.

Change-Id: I3bce24e54fb07df2dd460fb0f01d44516b3fcd0d