0f8787db80
This reverts commit 9d5ee19952.
Reason for revert: Broke a tapl test
Change-Id: Iafc513ca64f751d09c8606c072b29c589f030ad6