This reverts commit 06a6fc0401. Reason for revert: unexpected parsing failure Change-Id: Ie4b42e085ee5677bb8e15ca716edf5ae1b976f72
06a6fc0401