Breaks compilation of tests. This reverts commit 54953dfd. Change-Id: I868b876c3130be61f1169c5fccdffc0368bee11e