Breaks master build. This reverts commit 7fbdaddfac. Change-Id: I53d090f7dee8ed30fc49d908939153996cdb2298
7fbdaddfac