This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
62653cf65d
b81bb9eeea
# Conflicts: # assets