Revert all recent tar changes for Q.
am: 793a3cae97

Change-Id: Ifffc4ab1a5a4db1361a93e726a330c28a473e744