This reverts commit 700c8a03. Reason for revert: Broken master build Change-Id: Ia0171ff9250228cc03685e7f03da8dd9e374826f