Revert "Hack fix the build"

This reverts commit f4949f7c9d807baadbfb4c830cde85d85b6160ea.

Change-Id: Idb4d145997fbde111483f98f81a45a04bc37b14e
Merge "Revert "Hack fix the build"" into lp5.0