Revert changes for 3rd party apps, not needed anymore

Change-Id: I5b3aba600158ed5b021bfe4ea6e4395873f42103