reverting my wikimediastories multiple patchsets and commits

Change-Id: If1482c88d84643176ee8ebdce974b003e0e408a5