ef7b4d5dae
This reverts commit 0f8787db80.
Reason for revert: Revert and fix the broken tapl test
Fixes: 184054813
Change-Id: Ib647e11bfa0a2dc79a5a815be56452bb07e04ddf