This reverts commit bd1d995c. Remove the feature from the release as it requires additional work. BUG=webm:1485 Change-Id: I1a01ac2525703af97a456a3eed85718306c0f734