Re-remove experiment code for moduleStorage

The second iteration of the experiment is done, so this can once again be
removed. This patch reverts commit Ifa97d36d3.

Change-Id: If85b392d3e29de57316d32ba81c9b172bef758dd
Merge "Re-remove experiment code for moduleStorage"