Let's hope this will finally work, it was like this before commit
4e102d6a

Change-Id: I6337d4f1abc386e71747b2a37e55a3578bcbf340