Assets 2
This reverts commit fce1c96b65005c78b3016e855a3e4790bd5c6449.

(cherry picked from commit a38611468f4b1c6fcb7ceace231bb097d89f0226)