Assets 2
This reverts commit 57b8382864c9999e4745e358eb9a0a128af55eb1.