This reverts commit ba1332d1b4. Reason for revert: Broke taimen builds in master Change-Id: Iffffadbacae8c6c69907dcecc447f958cf6ce909
ba1332d1b4