Revert "Fixing 12 scary from the engine-storage-volume module. All the issues were related to passing null to methods that expect a nonnull parameter and also methods passing wrong types."

This reverts commit e220b9239422b72a5e7c97cfcd6318cb4fe54b3a.