Revert "Merge branch 'no_more_assets' into surin-dev"

This reverts commit 4590facc10760cfcf8067f50707293090ad94003, reversing
changes made to 5e37776e325313de98f21f07b107c23058ad6755.