This reverts commit 723d9d87ea. Latest builds have support for this feature. Change-Id: Ie6511d937df977a24edd49c67fb9560e21196696
723d9d87ea