Revert changes for 3rd party apps, not needed anymore

Change-Id: Icc440428f6349d9c25f95a86fbac7775424080ea