Revert Id39d4457a: Remove experiment code for moduleStorage