This reverts commit c86bd74c67. Reason for revert: Need to wait for apps to make fixes first Change-Id: I337a0b56d268093fc8689152002a6f8a8ceb258f
c86bd74c67