This reverts commit df937c5b. Reason for revert: the original change was not tested in pi-layoutlib-dev first Change-Id: Iacf8182244b7d911ec0ff20271500319507fa725