bring back needed tabs

Change-Id: I688a322be5b226d7ca5bc1eb0d1143ff4d39dc74