Assets 2
This reverts commit a68535d8fd0681e8bc8a81aaf63d6136486b2dca.