Backout bug 501689 - Investigate making storage asynchronous a=bustage