Revert "Revert "Environment assets""

This reverts commit e83f16351ffa7b38fdd2358677b9b1e5f4907c76.